Incorporate changes from https://github.com/webedx-spark/Priam/commit/40...

...52c66f5312d619e614d418c9b998523e750a20