Alert dialog: fixed passing in custom options
Merge branch 'release/1.4' into develop