Merge branch 'main' into 491-handle-external-links