True, I'll change that and then merge.
I think cherry-pick of the last two commits to release-2.1 should be no problem. Ok?