Merge branch 'main' into align/align-idgen-random