Fixed the EPR : 377397
Merge branch 'develop' of https://github.com/HSA-Libraries/Bolt into Hdevelop