master-bc-2860

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