master-bc-2500

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