Merge branch 'content-burn-subs' into 2.0