Merge branch 'feature/undo-validator-reduced' into 'develop'