Hand-merging changes from repo (2 / 3)