Layer modification

Suppress business logic dependence.
Merge remote-tracking branch 'origin/master' into Develop
Merge layer modification