Merge "Use the right executor for callbacks in Shell code" into sc-dev