Upstream release 8.u11.b12 and fix versioning scheme