Bring master ID Validation up to date with 21.0 and 21.1

This includes all the changes that have gone into either 21.0
or 21.1 but which somehow have not yet made it into the master
branch.

We do not want to make any changes to the code in this merge
request since we need the code to be consistent with 21.0 and
21.1. Any comments on the code should refer to the merge requests
in the other releases