master-bc-2733

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