Bug backports

[agubler]

Type: bug

The following has been addressed in the PR:

• There is a related issue
• All code has been formatted with prettier
• Unit or Functional tests are included in the PR

Description:

Backports of #333 and #334

[codecov]

Codecov Report

Merging #335 into v6 will not change coverage.
The diff coverage is 0%.

@@           Coverage Diff           @@
##               v6     #335   +/-   ##
=======================================
  Coverage   48.39%   48.39%           
=======================================
  Files          10       10           
  Lines         686      686           
  Branches      195      195           
=======================================
  Hits          332      332           
  Misses        354      354

Impacted Files	Coverage Δ
src/base.config.ts	19.65% <0%> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f088f9f...710569b. Read the comment docs.

[agubler]

Merging cherry-picked backports for v6