Merge branch 'staging' into staging_text_generation