7.0 merge to obtain update