Merge "Moving a bit of code around"