Merge branch 'develop' into release/candidate

* develop:
Merge branch 'release/candidate' into develop

* release/candidate: