Merge tag '2.6.0' into develop

2.6.0
Remove external dependencies