Merge branch 'kh/tutorial-grammofix' into maint