LPS-38659 Performance improvement