Merge "Re-commit some changes which were lost"