7.0 merge with master