master-bc-2762

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