master-bc-2727

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