RMStore 0.5
Merge pull request #11889 from hpique/master

RMStore 0.5