Merge remote-tracking branch 2.x into 3.0