Merge branch 'gadget' into for-next