Merge changes Id32773c0,Id876742f