master-bc-2490

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