This is a simple patch that forces dss to create the AV the same way clusters are pre-created. I have tested this locally without any apartment.xml and with already present one and the group is always properly created and written back to xml if needed.