Merge branch 'master' into logs_job