TC upgrade to cam-aligner_1804