Adjust previous style because it did not take
Merge branch 'test' into prod