(cherry picked from commit b00c9410)
Closes #3409961
Merged results pipeline #66243 passed
#66248
Merged results pipeline passed for 9cea4a8e 1 year ago
11.x
10.1.x
changed target branch from 11.x to 10.1.x