LPS-50910 fix it globally