Merge branch 'fixes-for-new-overloading-checks' into 'master'

Fixes for changes to the overloading system

See merge request !295
1 job for master in 1 minute and 57 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #73870
test-nightly

00:01:57