mod: finish VoD in Orientation Report + RA
fix: merge conflicts