master-bc-879

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