master-bc-2808

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