ccld-07 #797 (ccld-07)