CAL-812 Fixed regression bugs from TC: CAL-851, 846 and 847