Merge branch 't/girocco/style-updates' into refs/top-bases/girocco