Update 4.0.10 branch with master updates