Merge pull request #5263 from bugoverdose/fix/reject-on-id-change

Merge pull request #5263 from bugoverdose/fix/reject-on-id-change #5906