Enable ArgFileIndex2 to be swapped in
Merge remote-tracking branch 'origin/master'