master-bc-2099

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