Pull in release/3.8.5 changes into develop

Performing this with a manual merge but am logging the merge here as a PR.