Merge "solve bidirectional dependencies between ci and utils modules"