Development to master merge.

we use the following name pattern for id's: xxx_xxx_xxx
For example: root_layout