Distinct version for patch/amd branch
Change assertion to receive more helpful error messages