[FIX] Advanced: Fix cancelEdit* behavior
Merge pull request #1847 from rht/develop

[FIX] Advanced: Fix cancelEdit* behavior