Merge "Adaptive motion control on ref and search range"