Merge commit '3b3b2c3c7a12969cd6a2e264a06dd108033496ee'
Merge commit '7d09f2049bcd3cd0be52af2da9b7b35825a182e2'
remove short name, tune svc-used ABNF production names