LPS-50555

LPS-50555 was resolved earlier this month but probably still fine to push commits for it ya?