[OEM-75] flash message fix
Merge branch 'master' into develop