Merge proposals

cri_3d has no merge proposals.