ccld-10 #1617 (ccld-10)