ccld-12 #1630 (ccld-12)