master-bc-876

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