master-bc-553

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