master-bc-843

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