Resolve prerelease upgrade targets (#2367)