Merge branch 'layers-by-id'