(cherry picked from commit b31bd4c0) Conflicts: src/core.js src/data.js
Attach a file by drag & drop or click to upload
