Merge branch 'main' into '1020-fix-aeid-selection-errors'