Merge "[Aware] Allow to use '_' underscore in Aware service name" into sc-dev