fixes #7133 contact edit form delete subrecords
Merge branch 'dev' into test