master-bc-792

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