Merge "Fix local adjust" into gb-ub-photos-bryce