Merge branch 'develop' into bugfix-12451
[[ Bug 12451 ]] Added 'windowCancel' event to handle popup window cancellation.