Merge branch 'vendor/DIALOG'