Qf/2.10 candidate

(ignore this, just want to make an easy to share diff)