master-bc-2925

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