Merge pull request #2964 from hardening/udp_appender