[cpqd-monet] Merge