Add -i/-x option support from upstream