Manually merged #187