MT#5887 fix a17d3c9ef4f2693fb05db603f2594278b3f8ffad

(cherry picked from commit 58b0eb8532f238cc7ba21f423d3a60960424c081)