LPS-37435 Make Global export/import consistent