LPS-32066

Hi @rotty3000,

please could you verify this is a good approach? 

I'm not sure if it isn't too restrictive and won't create new regressions.

Thank you.

-- tom +