tern: convert our custom markdown to dfxp during the migration
Merge remote-tracking branch 'origin/dev' into dev