Release/2.6.0

Merge release/2.6.0 into develop