Manually merged #492