master-bc-2511

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