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