2.1 upgrade 1.9

Supersedes #2675