Merge "Further handover support changes."