Merge branch 'jk/do-not-printf-NULL' into maint