(refactor) extract serving files and calculating filenames.
Merge branch 'master' into integration

* master:
  (refactor) extract serving files and calculating filenames.