LPS-37928 Apply every where