Merge branch 'partial-fixes'