Update of the 4GDH branch fork with the current Annex60 branch