Merge branch 'direct-fix'