master-bc-2461

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