LPS-41931 Simplify fix, and this matches to framework better
LPS-41931 Apply changes