Merge branch 'master' into htj2c