Add missing final
Merge branch 'step-2' into step-3
Merge branch 'step-3' into step-4