Develop

Merging into master for release.

[Delivers #83918906, #83922502, #83469944]