Merge branch 'us/printf-not-echo' into maint