Rebased #486 - adds target_guid to river