Merge commit 'fixes' into next/cleanup