Merge "Replace Handler with Executor" into sc-dev