- rel 7; branch diff updated