Merge branch 'feature/fixzsh' into release/2.6.0beta4