Backporting ID column feature to 1.x