master-bc-2336

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