master-bc-2621

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