Merge pull request #2128 from scottyaslan/devBranch

[BISERVER-12174] Code for MOBILE-458 created injection vulnerability in ...
[BISERVER-12174] Code for MOBILE-458 created injection vulnerability …