master-bc-2611

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