2.5.0 beta 2 to Master branch

Make 2.5.0 Production