Merge "Add new indicators" into gb-ub-photos-bryce