Merge "2/ Migrate some common shell classes to use executors"