master-bc-2488

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