Merge branch 'dev-rearrange-fun-args' into 'master'

Incorporate first version of file logger and rearrange function arguments

See merge request es/auto-s2s!28