Whole bunch of changes for bringing crc stuff in
Merge branch 'build_integration'