Merge branch 'drawimage-outlet'

10 jobs for master in 324 minutes and 38 seconds (queued for 523 minutes and 24 seconds)