master-bc-2594

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