Merge branch 'main' into settings-for-journal