Merge branch 'bg/apply-blank-trailing-context' into maint