Merge changes I8783ad29,I2c860a84 into devel/master