Merging 3428407 into v1

Conductor for this PR is @edoardopirovano

Contains the following pull requests:

• Mergeback v1.0.6 refs/heads/v1 into main #622 - Mergeback v1.0.6 refs/heads/v1 into main (@edoardopirovano)
• Augment where we insert baseline lines of code #624 - Augment where we insert baseline lines of code (@edoardopirovano)

Please review the following:

• The CHANGELOG displays the correct version and date.
• The CHANGELOG includes all relevant, user-facing changes since the last release.
• There are no unexpected commits being merged into the v1 branch.
• The docs team is aware of any documentation changes that need to be released.
• The mergeback PR is merged back into main after this PR is merged.