master-bc-984

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