This seems to be causing a performance regression (reported by Nicolas).. and the leak it fixes is quite hypothetical. (Ie. hit by apps that destroy/create context many times.) On master, I think this can be solved by switching on 'reorder' by default but that is probably too much of a behaviour change for stable. BR, -R