Fix failing Api Odin Tests
Merge branch 'master' into us5975