Merge fix to style duplication from the 1.x develop branch