LPS-33014

For detailed explain please see http://issues.liferay.com/browse/LPS-33014