merged #473