master-bc-2561

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