master-bc-2984

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