Merge "Fix : recent Connectivity module with old NetworkStack module"