Finally fixing it
Merge branch 'fix3' into dr_staging
4-1
4-2
4-3
5-1
5-2
5-3
Merge branch 'fix4' into dr_staging
Merge branch 'fix5' into dr_staging