Merge branch 'master' into subset-varstore