Branch to copy the INGV wave branch, where we will add coupling - copied from r5518 to avoid merge problems