Merge branch 'master' into 'master'

Simplify basic reflash steps

See merge request !425
2 jobs for master
in 1 minute and 19 seconds, using 0.0 compute credits, and was queued for 2 seconds