Merge "Bug fixed related to service-instance metadat" into frankfurt