update addlayer
update addlayer
manual update based on source-raster branch
Merge branch 'master' into manual-merge