master-bc-3082

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