LPS-35408 Performance improvement