Merge "Dynamically update DatastoreContext properties"