Merge "Fix the PrefixExecutor."