master-bc-978

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