merged #7