Independently delegate data-api selectors

Fixes #14462.
Closes #14463 by merging it.
grunt