Merge branch 'fix-auxdir2-test'