master-bc-976-2

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