Merge "Enhanced Connectivity Enabled Default" into rvc-dev