Merge "Moving ONUs around"