master-bc-308

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