master-bc-970

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