LPS-49364

Logically depends on: https://github.com/matethurzo/liferay-portal/pull/821