#21126 - Updated to use the latest version of the core show_dialog/modal
functions