master-bc-835

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