Merge branch 'master' into sync_interface
Provide warning prompt for sync

When sync operation is initiated, a warning message about undo will be
displayed and will prompt user whether to continue or not.
Merge branch 'sync_interface'