CAL-824 merge master <- stabilization
CAL-824 merge master -> stabilization