master-bc-2412

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