master-bc-2549

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