master-bc-2114

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