1.7.0-rc8
fix for failing test
Merge pull request #1422 from overlookmotel/fix-failing-test

fix for failing test
fix performance regression
[merge]