Merging the two main branches of ORCID Support development