master-bc-786

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