Merge "Fix issue #10461600: KLP API Review: UndoManager" into klp-dev