Merge "Fixed handover not working issue"