MAGN338 Fix
Merge branch 'Issue_338_fix' into UndoRedoRecorderChangeToEnum