ccld-10 #588 (ccld-10)