Closes #3650 (closed) which no longer duplicates (probably fixed by !10416 (merged) rather than this MR though).