Merge changes I73656a3e,Ic6a1d6e9 into devel/master