Merge branch 'next-submission-link'