master-bc-2432

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