Merge "Reduced the complexity of layers composition."