fix3-1.txt
fix3-2.txt
fix3-3.txt
Finally fixing it
Merge branch 'fix3' into dr_develop