master-bc-2280

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