Merge branch 'sp/maint-clear-postfields' into maint