master-bc-2921

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