87dd2712
Resolved conflicts taking sprint improvements where they supersede. Both branches contributed to this merge.