master-bc-1099

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