Merge Dev branch for V 5.0.0