Cherry-pick #8328 to 6.x: Promote docker
input to GA
#8339
+1
−5
Merged