master-bc-2096

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