[core] Fixes for Riak IO
[merge] Merging with changes on dsp62.