Issue CIT-692