Merged changes of 2.6.0 -> 2.6.1.