Merge branch 'auto-recursion' into next
Merge branch 'horvand-cover-for-qc' into next