Merge "Fix GR_API Homing"