Merge branch 'mariojunior-fix-progress' into dev