I'm not sure about the location here, but no problem.  Regarding overall, these changes are mostly isolated, so it's an easy merge.