master-bc-2641

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