More merging fixes
Merge branch 'style-merging'