CAL-824 fix version of dependency
CAL-824 merge with master