Take latest freeDiameter
Merge branch 'vg_fix' into dev