Merge branch 'undo-fixes' into 'develop'