master-bc-985

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