Merge "Add Executors to NSD shim"