LPS-42785

from https://github.com/hhuijser/liferay-portal/pull/1633