Minor fixes
Merge upstream/foundation-5 into foundation-5
Merge pull request #72 from manishsongirkar/foundation-5

Minor Fixes in Backend