This is against v1.2.x where #2010 is against master. I think it needs to be the other way around...