first merge
merge corrections
merge comment
fix link + fix count
Merge branch 'feature/merge_r1' into develop