master-bc-1030

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