MT#7495 fix new flow introduced by 8ee92ee161d4fdd074027e90d2bf726a0836d18c

(cherry picked from commit 77408a07dcfccf1e1a095ce79628139e293a3dc0)