Merge latest master code into 2.10 branch