master-bc-1029

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