ccld-10 #797 (ccld-10)