Merge branch 'master' into intermittent_fail_investigate