Merge changes I6399a6ca,Iae5f8784,I40eb6797,I8ba65736 into devel/master