Manually merged #42