Merge "Finish the refactor work of bccPrepareExecutable"