master-bc-2880

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