merged #398