Merge remote-tracking branch 'origin/test_fix' into gitignore