master-bc-1070

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