Merge branch 'master' into var-subset

rebase master