Merge branch 'remove-useless-inline-functions-from-net'