Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.

ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.h

@@ -58,6 +58,10 @@ public:
 protected:
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
     caf::PdmFieldHandle* objectToggleField() override;
+    void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
+
+private:
+    void updateViews();
 
 protected:
     caf::PdmField<bool>                      m_isActive;