Merge "Change using Handler to using Executor" into sc-dev