Merge Develop for initial 2.5 release