Merge "[Dovetail] Bugfix: Dovetail CI jobs failed on compass"