Merge branch 'js/vreportf-wo-buffering'