Merge branch 'master' into ueno-pss