master-bc-2313

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