master-bc-2744

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