This fixes #1621 until Microsoft approves the account for the current API and therefore forward-ports !1006 (merged) as we decided to no longer use a release branch.