Merge branch 'for-3.4/cleanup-and-fixes' into for-next