LPS-47548 More robust way to prevent export unnecessary packages
LPS-48147 Rename