merged #379