Fixed  EPR# 376587
Merge branch 'develop' of https://github.com/HSA-Libraries/Bolt into HSAdevelop