Merge "Add DANM network support through annotations"