ccld-10 #1659 (ccld-10)