Merge branch 'rj/maint-t9700' into maint