master-bc-2147

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