master-bc-3031

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