Merge "[GENERAL] Allow different port for svc and pod"