LERGO-358 - fixing bug. using a flag on scope to hide the last step. other solutions does not apply to this scenario.
Merge remote-tracking branch 'origin/develop' into develop