master-bc-2528

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