Hand-merging changes from repo (1 / 3)