Merge branch 'for-4.10/firmware' into for-4.10/reset