Merged dev and bumped to 2.6