(cherry picked from commit e4846e42)
Closes #3441377
11.x
10.2.x
changed target branch from 11.x to 10.2.x