v2.6.0 usability improvements