v2.7.0 Various fixes and improvements