manually merged #623