master-bc-2981

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