Review/module 025 vi

Merged LeDub DUB requested to merge review/WIP-module-025-vi into develop

Merge request reports