Fixes #3452 : Improve workflow user experience