Merge changes I6d000008,Ibca83786 into devel/master