master-bc-2998

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