Merge this PR once other PRs are ready: https://github.com/generative-computing/mellea/pull/977
Merge this PR once other PRs are ready: #977