Merge "Fix default homing"