master-bc-2271

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