fix #179
Merge branch 'hotfix/layer-align'