Style blocks update
Merge branch 'upstream/develop'