Merge branch 'nl/rebase-i-cheat-sheet' into maint