Merge branch 'session1-mw'