LPS-51084

This PR depends on https://github.com/brianchandotcom/liferay-portal/pull/22193