master-bc-2222

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