Compile fix...
Merge branch 'newlayout' into deploy-west