Merge pull request #1 from gg-rip-integration/master

Merge pull request #2 from chiniwarvinay/master
Merge remote branch 'upstream/master'
Merge pull request #6 from gg-rip-integration/develop

Develop
Merge remote branch 'upstream/master' into develop
Merge pull request #7 from chiniwarvinay/develop

Develop