Fixes #9400 Also fixes an issue with the nightly acceptance tests that @pmcatominey has fixed in the SDK