Fixes #14894 (cherry picked from commit b8133e282c) Conflicts: src/data.js test/unit/data.js
b8133e282c