[SP-1294] backport of logic from 5.1 to fix flashing during parameters