Merge branch 'develop' into bug/6211-fix-contact-nets-all