Skip to content

feat(cypress): tag failure screenshot upload result#9232

Merged
juan-fernandez merged 4 commits into
masterfrom
juan-fernandez/cypress-screenshot-upload-tags
Jul 7, 2026
Merged

feat(cypress): tag failure screenshot upload result#9232
juan-fernandez merged 4 commits into
masterfrom
juan-fernandez/cypress-screenshot-upload-tags

Conversation

@juan-fernandez

@juan-fernandez juan-fernandez commented Jul 7, 2026

Copy link
Copy Markdown
Collaborator

What does this PR do?

Adds Cypress test-event tags for failure screenshot upload outcomes:

  • test.failure_screenshot.uploaded:true when a failure screenshot upload succeeds.
  • test.failure_screenshot.upload_error:true when upload is enabled but an attempted upload fails.
  • No screenshot upload tag when DD_TEST_FAILURE_SCREENSHOTS_ENABLED is not enabled or no upload is possible.

The Cypress plugin now waits for the upload outcome before finishing the failed test span, so the upload result lands on the test event. It also keeps suite duration independent from media upload latency, preserves custom after:screenshot handling in the auto-instrumented path, and reports dropped media requests as upload errors.

Motivation

Follow-up to #8981 so users can distinguish disabled screenshot uploads from successful uploads and upload errors in Test Optimization events.

Additional Notes

Validation covered syntax, lint, the screenshot upload request unit spec, and focused Cypress failure screenshot upload scenarios. The focused Cypress run passed the agentless cases; the EVP proxy variants remain pending as expected.

Semver: semver-minor.

@dd-octo-sts

dd-octo-sts Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Overall package size

Self size: 6.6 MB
Deduped: 7.25 MB
No deduping: 7.25 MB

Dependency sizes | name | version | self size | total size | |------|---------|-----------|------------| | import-in-the-middle | 3.3.0 | 117.14 kB | 432.47 kB | | opentracing | 0.14.7 | 194.81 kB | 194.81 kB | | dc-polyfill | 0.1.11 | 25.74 kB | 25.74 kB |

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@datadog-datadog-us1-prod

datadog-datadog-us1-prod Bot commented Jul 7, 2026

Copy link
Copy Markdown

Tests

🎉 All green!

🧪 All tests passed
❄️ No new flaky tests detected

🎯 Code Coverage (details)
Patch Coverage: 85.42%
Overall Coverage: 87.60% (+0.01%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: ac923b6 | Docs | Datadog PR Page | Give us feedback!

@pr-commenter

pr-commenter Bot commented Jul 7, 2026

Copy link
Copy Markdown

Benchmarks

Benchmark execution time: 2026-07-07 13:30:43

Comparing candidate commit ac923b6 in PR branch juan-fernandez/cypress-screenshot-upload-tags with baseline commit 37a5069 in branch master.

📊 Benchmarking dashboard

Found 0 performance improvements and 0 performance regressions! Performance is the same for 2246 metrics, 40 unstable metrics.

Explanation

This is an A/B test comparing a candidate commit's performance against that of a baseline commit. Performance changes are noted in the tables below as:

  • 🟩 = significantly better candidate vs. baseline
  • 🟥 = significantly worse candidate vs. baseline

We compute a confidence interval (CI) over the relative difference of means between metrics from the candidate and baseline commits, considering the baseline as the reference.

If the CI is entirely outside the configured SIGNIFICANT_IMPACT_THRESHOLD (or the deprecated UNCONFIDENCE_THRESHOLD), the change is considered significant.

Feel free to reach out to #apm-benchmarking-platform on Slack if you have any questions.

More details about the CI and significant changes

You can imagine this CI as a range of values that is likely to contain the true difference of means between the candidate and baseline commits.

CIs of the difference of means are often centered around 0%, because often changes are not that big:

---------------------------------(------|---^--------)-------------------------------->
                              -0.6%    0%  0.3%     +1.2%
                                 |          |        |
         lower bound of the CI --'          |        |
sample mean (center of the CI) -------------'        |
         upper bound of the CI ----------------------'

As described above, a change is considered significant if the CI is entirely outside the configured SIGNIFICANT_IMPACT_THRESHOLD (or the deprecated UNCONFIDENCE_THRESHOLD).

For instance, for an execution time metric, this confidence interval indicates a significantly worse performance:

----------------------------------------|---------|---(---------^---------)---------->
                                       0%        1%  1.3%      2.2%      3.1%
                                                  |   |         |         |
       significant impact threshold --------------'   |         |         |
                      lower bound of CI --------------'         |         |
       sample mean (center of the CI) --------------------------'         |
                      upper bound of CI ----------------------------------'

Unstable benchmarks

These benchmarks have a confidence interval too wide to call a change; treat them as noise rather than signal.

scenario:appsec-appsec-enabled-24

  • unstable execution_time [-136.709ms; +208.814ms] or [-5.261%; +8.036%]

scenario:appsec-appsec-enabled-26

  • unstable execution_time [-208288.354µs; +209697.354µs] or [-8.295%; +8.351%]

scenario:appsec-appsec-enabled-with-attacks-26

  • unstable execution_time [-158.048ms; +155.356ms] or [-5.486%; +5.392%]

scenario:appsec-control-20

  • unstable execution_time [-112164.295µs; +112914.229µs] or [-6.906%; +6.952%]

scenario:appsec-control-24

  • unstable execution_time [-99.184ms; +102.031ms] or [-8.189%; +8.424%]

scenario:appsec-control-26

  • unstable execution_time [-117.133ms; +112.659ms] or [-9.702%; +9.332%]

scenario:debugger-line-probe-with-snapshot-default-24

  • unstable cpu_user_time [-1270.532ms; +2510.850ms] or [-14.709%; +29.069%]
  • unstable execution_time [-1266.491ms; +2520.853ms] or [-13.571%; +27.012%]
  • unstable instructions [-10.9G instructions; +21.8G instructions] or [-15.508%; +30.947%]
  • unstable max_rss_usage [-6.102MB; +10.097MB] or [-3.889%; +6.435%]
  • unstable throughput [-705.506op/s; +310.155op/s] or [-20.185%; +8.874%]

scenario:debugger-line-probe-with-snapshot-default-26

  • unstable cpu_user_time [-3590.570ms; +3566.715ms] or [-31.949%; +31.736%]
  • unstable execution_time [-3691.413ms; +3651.140ms] or [-30.882%; +30.545%]
  • unstable instructions [-31514.9M instructions; +31556.1M instructions] or [-33.347%; +33.391%]
  • unstable max_rss_usage [-11017.982KB; +11357.982KB] or [-6.698%; +6.905%]
  • unstable throughput [-782.572op/s; +810.935op/s] or [-27.435%; +28.429%]

scenario:debugger-line-probe-with-snapshot-minimal-24

  • unstable cpu_user_time [-2592.011ms; +2733.655ms] or [-26.233%; +27.666%]
  • unstable execution_time [-2596.326ms; +2723.546ms] or [-24.553%; +25.756%]
  • unstable instructions [-21983.7M instructions; +23196.1M instructions] or [-27.018%; +28.508%]
  • unstable max_rss_usage [-11724.980KB; +11120.180KB] or [-7.191%; +6.820%]
  • unstable throughput [-759.437op/s; +707.007op/s] or [-23.949%; +22.296%]

scenario:debugger-line-probe-without-snapshot-24

  • unstable cpu_user_time [-1749.902ms; +3363.740ms] or [-18.863%; +36.260%]
  • unstable execution_time [-1787.968ms; +3382.473ms] or [-17.946%; +33.951%]
  • unstable instructions [-14.9G instructions; +28.9G instructions] or [-19.591%; +37.882%]
  • unstable max_rss_usage [-9.784MB; +12.516MB] or [-6.045%; +7.734%]
  • unstable throughput [-1008.879op/s; +418.860op/s] or [-29.795%; +12.370%]

scenario:debugger-line-probe-without-snapshot-26

  • unstable cpu_user_time [-2859.462ms; +4147.745ms] or [-26.983%; +39.139%]
  • unstable execution_time [-2919.819ms; +4182.684ms] or [-25.826%; +36.996%]
  • unstable instructions [-25.3G instructions; +36.5G instructions] or [-28.466%; +41.022%]
  • unstable max_rss_usage [-8.713MB; +12.919MB] or [-5.358%; +7.944%]
  • unstable throughput [-907.737op/s; +633.567op/s] or [-30.304%; +21.151%]

scenario:dogstatsd-with-tags-20

  • unstable cpu_user_time [-404.535ms; +283.284ms] or [-8.338%; +5.839%]
  • unstable execution_time [-404.023ms; +281.311ms] or [-8.200%; +5.710%]
  • unstable throughput [-87339.014op/s; +147587.891op/s] or [-5.153%; +8.707%]

scenario:plugin-aws-sdk-extract-response-body-24

  • unstable cpu_user_time [-89.130ms; +76.241ms] or [-5.539%; +4.738%]
  • unstable execution_time [-88.379ms; +75.302ms] or [-5.489%; +4.677%]

scenario:plugin-aws-sdk-lambda-inject-with-context-24

  • unstable cpu_user_time [-216.895ms; +211.112ms] or [-5.567%; +5.419%]
  • unstable execution_time [-218.309ms; +211.093ms] or [-5.570%; +5.386%]
  • unstable throughput [-25720.545op/s; +27128.123op/s] or [-5.009%; +5.283%]

scenario:plugin-graphql-long-with-depth-off-20

  • unstable max_rss_usage [-3.405MB; +9.912MB] or [-2.637%; +7.678%]

@codecov

codecov Bot commented Jul 7, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 94.79167% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 93.49%. Comparing base (37a5069) to head (ac923b6).
⚠️ Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
...kages/datadog-plugin-cypress/src/cypress-plugin.js 93.90% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9232      +/-   ##
==========================================
- Coverage   93.55%   93.49%   -0.07%     
==========================================
  Files         900      901       +1     
  Lines       52941    53380     +439     
  Branches    12491    12602     +111     
==========================================
+ Hits        49531    49907     +376     
- Misses       3410     3473      +63     
Flag Coverage Δ
aiguard 34.89% <100.00%> (-0.16%) ⬇️
aiguard-integration 41.87% <100.00%> (-0.09%) ⬇️
apm-bucket-0 34.81% <100.00%> (-0.16%) ⬇️
apm-bucket-1 40.39% <100.00%> (-0.17%) ⬇️
apm-bucket-2 37.40% <100.00%> (-0.16%) ⬇️
apm-capabilities-tracing 49.01% <46.15%> (+0.07%) ⬆️
apm-integrations-aerospike 33.04% <100.00%> (-0.15%) ⬇️
apm-integrations-confluentinc-kafka-javascript 40.00% <100.00%> (-0.09%) ⬇️
apm-integrations-couchbase 33.32% <100.00%> (-0.15%) ⬇️
apm-integrations-http 41.93% <100.00%> (-0.18%) ⬇️
apm-integrations-kafkajs 40.18% <100.00%> (-0.15%) ⬇️
apm-integrations-next 29.56% <100.00%> (-0.13%) ⬇️
apm-integrations-prisma 35.09% <100.00%> (-0.15%) ⬇️
apm-integrations-tedious 33.96% <100.00%> (-0.15%) ⬇️
appsec 57.74% <100.00%> (-0.14%) ⬇️
appsec-express_fastify_graphql 53.74% <100.00%> (-0.21%) ⬇️
appsec-integration 35.41% <22.22%> (+0.06%) ⬆️
appsec-kafka_ldapjs_lodash 43.64% <100.00%> (-0.17%) ⬇️
appsec-mongodb-core_mongoose_mysql 48.77% <100.00%> (-0.17%) ⬇️
appsec-next 27.62% <100.00%> (-0.11%) ⬇️
appsec-node-serialize_passport_postgres 47.96% <100.00%> (-0.18%) ⬇️
appsec-sourcing_stripe_template 45.52% <100.00%> (-0.17%) ⬇️
debugger 44.50% <100.00%> (-0.11%) ⬇️
instrumentations-bucket-0 28.10% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-1 37.50% <100.00%> (-0.16%) ⬇️
instrumentations-bucket-10 40.40% <100.00%> (-0.17%) ⬇️
instrumentations-bucket-11 27.90% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-12 28.73% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-13 27.73% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-2 30.29% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-3 35.97% <100.00%> (-0.16%) ⬇️
instrumentations-bucket-4 28.53% <100.00%> (-0.13%) ⬇️
instrumentations-bucket-5 36.20% <100.00%> (-0.27%) ⬇️
instrumentations-bucket-6 38.31% <100.00%> (-0.17%) ⬇️
instrumentations-bucket-7 36.06% <100.00%> (-0.15%) ⬇️
instrumentations-bucket-8 37.01% <100.00%> (-0.16%) ⬇️
instrumentations-bucket-9 39.50% <100.00%> (-0.17%) ⬇️
instrumentations-instrumentation-couchbase 46.48% <ø> (ø)
instrumentations-integration-esbuild 24.19% <22.22%> (-0.10%) ⬇️
llmobs-ai_anthropic_bedrock 39.58% <100.00%> (-0.15%) ⬇️
llmobs-google-genai_langchain_vertex-ai 36.90% <100.00%> (-0.13%) ⬇️
llmobs-openai 39.63% <100.00%> (-0.16%) ⬇️
llmobs-sdk 43.45% <100.00%> (-0.20%) ⬇️
master-coverage 93.49% <94.79%> (?)
openfeature 37.83% <100.00%> (-0.09%) ⬇️
openfeature-unit 50.47% <ø> (ø)
platform-core_esbuild_instrumentations-misc 22.63% <22.22%> (-0.09%) ⬇️
platform-integration 47.43% <100.00%> (-0.12%) ⬇️
platform-shimmer_unit-guardrails_webpack 18.18% <22.22%> (-0.07%) ⬇️
plugins-bucket-0 36.43% <100.00%> (-0.14%) ⬇️
plugins-bucket-1 39.67% <100.00%> (-0.10%) ⬇️
plugins-bucket-11 38.52% <100.00%> (-0.17%) ⬇️
plugins-bucket-17 39.11% <100.00%> (-0.17%) ⬇️
plugins-bucket-18 42.07% <100.00%> (-0.16%) ⬇️
plugins-bucket-19 39.86% <100.00%> (-0.17%) ⬇️
plugins-bucket-20 43.31% <100.00%> (-0.19%) ⬇️
plugins-bucket-4 37.79% <100.00%> (-0.16%) ⬇️
plugins-bullmq_cassandra_cookie 39.81% <100.00%> (-0.17%) ⬇️
plugins-cookie-parser_crypto_dd-trace-api 33.14% <100.00%> (-0.15%) ⬇️
plugins-fetch_fs_generic-pool 36.11% <100.00%> (-0.16%) ⬇️
plugins-google-cloud-pubsub_grpc_handlebars 42.96% <100.00%> (-0.18%) ⬇️
plugins-hapi_hono_ioredis 37.84% <100.00%> (-0.16%) ⬇️
plugins-jest_knex_langgraph 32.53% <100.00%> (-0.15%) ⬇️
plugins-ldapjs_light-my-request_limitd-client 27.80% <100.00%> (-0.13%) ⬇️
plugins-lodash_mariadb_memcached 35.08% <100.00%> (-0.16%) ⬇️
plugins-mongodb_mongodb-core_mongoose 36.37% <100.00%> (-0.16%) ⬇️
plugins-multer_mysql_mysql2 35.05% <100.00%> (-0.16%) ⬇️
plugins-nats_node-serialize_opensearch 37.21% <100.00%> (-0.16%) ⬇️
plugins-passport-http_pino_postgres 35.43% <100.00%> (-0.16%) ⬇️
plugins-process_pug_redis 34.17% <100.00%> (-0.16%) ⬇️
plugins-undici_url_valkey 35.94% <100.00%> (-0.15%) ⬇️
plugins-vm_winston_ws 37.61% <100.00%> (-0.17%) ⬇️
profiling 43.71% <100.00%> (-0.18%) ⬇️
serverless-aws-sdk-aws-sdk 33.14% <100.00%> (-0.24%) ⬇️
serverless-aws-sdk-bedrockruntime 32.12% <100.00%> (-0.13%) ⬇️
serverless-aws-sdk-client 37.16% <ø> (ø)
serverless-aws-sdk-dynamodb 34.18% <100.00%> (-0.06%) ⬇️
serverless-aws-sdk-eventbridge 27.21% <100.00%> (-0.21%) ⬇️
serverless-aws-sdk-kinesis 37.45% <100.00%> (-0.15%) ⬇️
serverless-aws-sdk-lambda 34.55% <100.00%> (?)
serverless-aws-sdk-s3 32.56% <100.00%> (-0.13%) ⬇️
serverless-aws-sdk-serverless-peer-service 39.53% <100.00%> (-0.18%) ⬇️
serverless-aws-sdk-sns 38.30% <100.00%> (-0.15%) ⬇️
serverless-aws-sdk-sqs 38.05% <100.00%> (-0.15%) ⬇️
serverless-aws-sdk-stepfunctions 33.14% <100.00%> (-0.13%) ⬇️
serverless-aws-sdk-util 47.95% <ø> (ø)
serverless-azure-functions-servicebus_lambda ?
serverless-bucket-0 39.52% <100.00%> (+0.89%) ⬆️
serverless-lambda 34.23% <100.00%> (?)
test-optimization-cucumber 52.53% <33.33%> (+0.25%) ⬆️
test-optimization-cypress 50.06% <91.66%> (+0.09%) ⬆️
test-optimization-jest 56.03% <33.33%> (+0.18%) ⬆️
test-optimization-mocha 53.77% <33.33%> (+0.38%) ⬆️
test-optimization-playwright-playwright-atr 43.27% <33.33%> (-0.29%) ⬇️
test-optimization-playwright-playwright-efd 43.56% <33.33%> (-0.05%) ⬇️
test-optimization-playwright-playwright-final-status 43.67% <33.33%> (-0.07%) ⬇️
test-optimization-playwright-playwright-impacted-tests 43.11% <33.33%> (-0.14%) ⬇️
test-optimization-playwright-playwright-reporting 43.23% <33.33%> (-0.05%) ⬇️
test-optimization-playwright-playwright-test-management 44.67% <33.33%> (-0.28%) ⬇️
test-optimization-playwright-playwright-test-span 44.46% <33.33%> (-0.06%) ⬇️
test-optimization-selenium 45.07% <33.33%> (-0.22%) ⬇️
test-optimization-testopt 46.35% <33.33%> (-0.24%) ⬇️
test-optimization-vitest 52.77% <33.33%> (+0.21%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@juan-fernandez

Copy link
Copy Markdown
Collaborator Author

@codex review

@juan-fernandez

Copy link
Copy Markdown
Collaborator Author

/datadog autotest review

@juan-fernandez
juan-fernandez marked this pull request as ready for review July 7, 2026 11:25
@juan-fernandez
juan-fernandez requested a review from a team as a code owner July 7, 2026 11:25

@datadog-datadog-us1-prod datadog-datadog-us1-prod Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Datadog Autotest: PASS

More details

Implementation correctly tracks screenshot upload outcomes and tags test events. Promises are properly chained to ensure test spans finish with tags before suite spans complete. No behavioral regressions detected through code analysis and synthetic testing.

Was this helpful? React 👍 or 👎

📊 Validated against 8 scenarios · Open Bits AI session

🤖 Datadog Autotest · Commit 7f2147d · What is Autotest? · Any feedback? Reach out in #autotest

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7f2147d083

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread packages/datadog-plugin-cypress/src/cypress-plugin.js Outdated
Comment thread packages/datadog-plugin-cypress/src/cypress-plugin.js
@juan-fernandez
juan-fernandez marked this pull request as draft July 7, 2026 11:50
@juan-fernandez

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Delightful!

Reviewed commit: 346bf856e5

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@juan-fernandez
juan-fernandez marked this pull request as ready for review July 7, 2026 12:58

@datadog-datadog-us1-prod datadog-datadog-us1-prod Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Datadog Autotest: FAIL

Found a screenshot filtering logic inconsistency in the cypress-plugin.js: isFailureScreenshotForUpload was overly restrictive compared to isFailureScreenshot. When a screenshot object lacks explicit testFailure metadata, isFailureScreenshotForUpload would not fall back to filename-based detection, whereas isFailureScreenshot would. This PR inadvertently introduced this bug while refactoring. Fix applied: added && screenshot.testFailure !== undefined check to align both functions' behavior, ensuring consistent screenshot identification across upload paths.

View proposed fix
📊 Validated against 6 scenarios · Open Bits AI session

🤖 Datadog Autotest · Commit 346bf85 · What is Autotest? · Any feedback? Reach out in #autotest

Comment thread packages/datadog-plugin-cypress/src/cypress-plugin.js
@juan-fernandez
juan-fernandez marked this pull request as draft July 7, 2026 13:15
@juan-fernandez
juan-fernandez marked this pull request as ready for review July 7, 2026 14:57
@juan-fernandez
juan-fernandez marked this pull request as draft July 7, 2026 14:58
@juan-fernandez
juan-fernandez marked this pull request as ready for review July 7, 2026 14:59
@juan-fernandez
juan-fernandez merged commit 0f8239d into master Jul 7, 2026
765 of 767 checks passed
@juan-fernandez
juan-fernandez deleted the juan-fernandez/cypress-screenshot-upload-tags branch July 7, 2026 15:01

@datadog-datadog-us1-prod datadog-datadog-us1-prod Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Datadog Autotest: PASS

More details

42 adversarial scenarios across getScreenshotUploadResult, isFailureScreenshotByMetadata/isFailureScreenshotForUpload divergence, the addScreenshotUploadPromise/getScreenshotUploadResultPromise tracker, and the async span-finishing order all pass. The finishSuite() promotion to before testSpanFinishPromises is safe — timestamps are pre-stamped and spans never reject, so the ordering change cannot cause dropped or misattributed spans.

Was this helpful? React 👍 or 👎

📊 Validated against 42 scenarios · Open Bits AI session

🤖 Datadog Autotest · Commit ac923b6 · What is Autotest? · Any feedback? Reach out in #autotest

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants