code done
Merge branch 'master' into shrey-reward
Merge branch 'master' into combo-img-fix
lazy loading