- 61455a7a278366a4356c6a124bfcd82550a2b59d Handle namespaced resources during datastore migration properly (#2250)