LPS-21609

http://issues.liferay.com/browse/http://issues.liferay.com/browse/LPS-21609