Low: cts: Further simplify CIB creation logic
Mercurial revision: f0617ea33ccd6fe692aec2daff793926b6830773