Fix SA1515/SA1612/S2681

[baranyaimate]

The issue or feature being addressed

Contributes to #1290

Details on the issue fix or feature implementation

Fix SA1515, SA1612 and S2681.

Confirm the following

• I started this PR by branching from the head of the default branch
• I have targeted the PR to merge into the default branch
• I have included unit tests for the issue/feature
• I have successfully run a local build

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.64%. Comparing base (0674bf8) to head (059af43).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2018   +/-   ##
=======================================
  Coverage   83.64%   83.64%           
=======================================
  Files         312      312           
  Lines        7105     7105           
  Branches     1054     1054           
=======================================
  Hits         5943     5943           
  Misses        789      789           
  Partials      373      373           

Flag	Coverage Δ
linux	83.64% <ø> (ø)
macos	83.64% <ø> (ø)
windows	83.64% <ø> (ø)

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

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