master-bc-982

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