Merge branches 'ClientInitRejectfix' and 'versionfix' into allupdates