fix bug
Merge branch 'feature/layercom' into dev