CAL-197 fix bugs after the merge from master to relooking(cont.)