ccld-06 #797 (ccld-06)