Intermediate merge to avoid excessive merge conflicts when performing more cleanup tasks.
mentioned in commit d13fe967
merged