Fixes Test
Merge branch 'master' into issue-2094