Merge "Add network host per LF ticket IT-17324."