Merge branch 'master' into probe_groups