Fix for SP-588
Backport of BISERVER-10297 - Able to inject tags into the dialog (5.0)
Merge pull request #1063 from e-cuellar/5.0

Fix for SP-588