Draft: Added Layer tool - issue #1504