Merge branch 'master' into pr-129