master-bc-2071

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