Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/search-service into hpa-config
