Added support for layer groups
Merge