3.8.1 release

What does this MR do?

MR for 3.8.1 patch release, cherry-picks:

• !1714 (merged)
• !1715 (merged)

Related issues

3.8.1 release (#1156 - closed)

Author's checklist

When ready for review, the Author applies the workflowready for review label and mention @gitlab-org/software-delivery/get-maintainers:

• Merge request:
  • Corresponding Issue raised and reviewed by the GET maintainers team.
  • Merge Request Title and Description are up-to-date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline
  • MR has no new security alerts in the widget from the Secret Detection and IaC Scan (SAST) jobs.