Merge branch 'release/1.7.2-beta.3' into develop
Revert "NOISSUE"

This reverts commit 8d3e62fc5e6e5f70d0fb1c6cddd8be76ec35ebd2.
Merge branch 'develop'