Merge branch 'release/12.4.6' into develop
Style and timing stuff.
Merge branch 'release/12.4.7'