master-bc-2431

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