ccld-10 #1657 (ccld-10)