Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint