master-bc-2888

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