Merge branch 'mark-elements-as-known' into next