Merge branch 'master' into sol006