LPS-38527 Import refactoring in light of the global stuff