Merge "fixed typos and added SERVICE_INSTANCE_ID" into dublin