master-bc-1007

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