Merge "Disable homing_solution"