Fix for condtions DB V2
Merge pull request #4488 from wmtan/FixConditionsDBv2

Fix for condtions DB V2