Development to master merge.

rename to ```rootLayout``` for instance.