Backported #797