Manually merged #223