Integrate #129 in mainline as well