LPS-31163

This pull request depends on https://github.com/juliocamarero/liferay-portal/pull/3066 do not merge until LPS-50671 is commited