master-bc-2466

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