master-bc-2227

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