Network Client: Apply astyle and merge conflict resolution for merge into master.