Backend pages
Merge remote-tracking branch 'upstream/master'
Minor Fixes
Merge remote-tracking branch 'sonali/master' into dev