master-bc-2370

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