ccld-10 #1631 (ccld-10)