Merge branch 'jk/maint-advise-vaddf' into maint