Merge upstream changes (ion_test)