Merge changes I2dff9828,Ie3c8048a,Ib1b1d3bc into devel/master