Merge branch 'adt-syslog-comparison-flags'