master-bc-2539

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