Merge branch 'ta/tutorial-modernize'