Merge pull request #142 from digawp/internal-ds
Misc fixes to InternalDataStore

(main@c8925d12cb5a538e7207153b57e35c563add51eb)