908510 - Corrected imports to use compat layer