backport: update to 31 with syslog patch