master-bc-3143

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