HHH-9488 - Move scanning from HEM to core