Merge stable (2.1.x) into master