master-bc-2600

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