LPS-35963

Please see: https://issues.liferay.com/browse/LPS-35963