Merge branch 'master' into py-compute-samples