Manually merged #39