merge industry changes to support Crius