LPS-39532

See my last commit. This is the way I propose to do it. Please let me know if you agree with this and if so I'll merge the commits to make the next review easier /cc @moltam89