[prep-release-3.0.12] More changelog items for the 3.0.12 release.
Merge branch 'prep-release-3.0.12' into develop-olympus

* prep-release-3.0.12:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.