LPS-50167 SF

Hey @johnnyhowey 

We also need this backported to ee-6.2.x

Thanks!