fix failing test
Merge branch 'release' into upstream