- Replace static import with regular one to fix S2S and non-official mappings. (#9633)