Merge of Ron's IP2.5 testing branch