merged #373