master-bc-880

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