Fork from MITO-6394

Code for CRC2018