Merge cb's zscale fix