Merge "change dovetail CI jobs on Apex"