Merge branch 'develop'
Merge branch 'develop'
Fix typos
TIVI - Adapt handling of algorithm flags