Merge branch 'layers'
26-10
26-10-2