CAL-975 fix issues after rebasing