Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev