Merge master into stabilization
CAL-824 Re-merge stabilization into master