LPS-48106

It depends on pull https://github.com/juliocamarero/liferay-portal/pull/2959 so do not merge it until the other pull is commited