version of PR1236 (hotswap support) for "next" branch
Merge pull request #1240 from drewfish/onestore

version of PR1236 (hotswap support) for "next" branch