Merge "Enable a few CI jobs"