master-bc-2492

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