master-bc-976-3

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