Merge "[COMMON][READINESS] Update readiness image and use service feature"