LPS-50322 Generated

From @hhuijser :

Hey Sergio,

This fix should be applied all across the board as this is an issue in other places as well...
You think there is a better way to fix this somehow centrally?

If this one passes review, Hai will work on fixing this in other places as well...