CQ devel changes