merge version #7