Merge branch 'masterLayout' into dev
Merge branch 'masterLayout' into dev