master-bc-2926

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