master-bc-980

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