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