#21707 Fixed
Merge branch 'i21707'
Merge branch 'master' into i19948