layer cleanup is silent no-op when no layers
Merge remote-tracking branch 'origin/master'