Merge tag 'v2.6.0' into develop