Release/2.6

Minor changes