Merge branch 'tg/maint__fix_website/cbsnews' into maint-0.4