Merge "features: Fix channel datastore access."