Fix: Restore style code lost by a commit.
Merge remote-tracking branch 'origin/3.5' into develop