Merge branch 'rs/document-archive-prefix' into js/scalar-diagnose