master-bc-2390

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