Merging everyday847/itest_fix (so that my previous PR's itest will run better) and beautifying master.