master-bc-2478

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