More preparation for plunch

[ice1000]

Fix #1317

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.57%. Comparing base (17cd151) to head (c21497e).
Report is 4 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##               main    #1318   +/-   ##
=========================================
  Coverage     83.56%   83.57%           
- Complexity     4138     4140    +2     
=========================================
  Files           373      373           
  Lines         12007    12006    -1     
  Branches       1414     1415    +1     
=========================================
  Hits          10034    10034           
  Misses         1223     1223           
+ Partials        750      749    -1     

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