Merge "Add identity check strings" into main