Merge "Fix framework and NetworkStack classes conflicts"