master-bc-2469

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