Refactor handling basenames of files
Merge branch 'refactor-uploadable' into wip-v2.4.0

* refactor-uploadable:
  Refactor handling basenames of files
[uploadable] migrate uploadable tests and listener