Merge branch '317853-fix-simpleverifier-merge' into 'master'

Resolve "SimpleVerifier merges types incorrectly when one type is an interface"

Closes #317853 and #315248

See merge request !206
1 job for master in 7 minutes and 37 seconds (queued for 11 seconds)
Status Job ID Name Coverage
  Test
passed #6094
build

00:07:37