MT#7169 update missing flow from cf58dab3ff4a