master-bc-830

https://issues.liferay.com/browse/LIFERAYQA-5883