master-bc-2224

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