Merge branch 'pending-misc' (early part) into devel