master-bc-3032

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