Merge "Rename KEY_AES_URL_STRING" into sc-dev