ccld-10 #1590 (ccld-10)