Hotfix/0.92.1

Intent

rebases and fixes conflicts with master in preparation of merging back into master

---

• This is meant for a hotfix
• This is meant for the next release (see milestone)
• This needs more reviewers than normal; there may be controversy or high complexity
• This intentionally introduces regressions that will be addressed later
• There is/will be documentation changes on the wiki
• Please do not send commits here without coordinating closely with the owner
• This is a Build System change

Related Issues

• #1134 (closed)
• #1137 (closed)
• #1149 (closed)
• #1152 (closed)
• #1146 (closed)
• #1161 (closed)
• #1139 (closed)
• #1162 (closed)

Steps to Test

1. [Step 1]

Future Work

[Type text here]

Additional Notes

[Type text here]