Port rc7 changes to release branch