Changes for alpha6.2