LPS-48695 Missinng commit (reopened)

https://issues.liferay.com/browse/LPS-48695

Hey Eudaldo,

This is the missing changes we were talking about last week. I've reopened the LPS since it has not been backported to any older branches yet, so it's safe to push additional commits as well as good for future tracking.

Please, also notify Brian that it's a reopened LPS.

Thanks & cheers,
Tibor