Fix regression
Merge branch '2.1'