Tweaking gold style
Merge branch 'test' into prod