Handle illegal ids
Merge branch '1.x'