Various cleanups, performance improvements, and new method
1 related merge request: !495 Various cleanups, performance improvements, and new method
branch
10 jobs
4 minutes 7 seconds, queued for 5 seconds