master-bc-2460

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