Merge pull request #209 from digawp/internal-fix
Internal DataStore fixes

(main@9c1ce7895548b7a054f059b211681166277e6f3d)