LPS-47694

from https://github.com/pure59/liferay-portal/pull/8