master-bc-2737

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