Merge branch 'master' into hhoyos/executors