Merge "Move shared methods to net shared lib"