MLHR-934 #resolve
Merge pull request #809 from andyperlitch/modal_options.MLHR-934

MLHR-934 #resolve