LPS-46764

Same pull than https://github.com/ealonso/liferay-portal/pull/224