Merge branch 'tarraf/metric_collection' into 'master'

fixed buffer overflow during large files writes


See merge request !268