https://issues.liferay.com/browse/LPS-85325