ccld-10 #1658 (ccld-10)