Layer union and simplification.
Merge remote-tracking branch 'origin/HEAD' into feature/edit
Merge remote-tracking branch 'origin/feature/edit' into feature/edit