Merge #833 into 2.99