#4137 continue consolidation