Merge branch 'registerdialog'