#21707 Fixed
Merge branch 'i21707'