Fix/velocity output

Merged Yue Wang requested to merge fix/velocity-output into master
Edited by Yue Wang

Merge request reports