master-bc-2564

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