SOS-2476

Related to https://github.com/hhuijser/liferay-portal/pull/2152