Merge 2.10.x into master

The merge started to fail mainly due to 2.10.3 release which modified `build.number`. Other than that, the merge was trivial.