master-bc-2772

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