rollback (do not use new state approach on layer editing
content edit fixes (still broken on the backend)