Merge branch 'DAVA/DF-2270_BaseAddEntityDialogImprovements'