Merge upstream 2.1.2

/cc @tmm1 @charliesome