#18965 Fixed bug
Merge branch 'i18965'