Merge pull request #1995 from suryanarayanakb/dev-branch

Changed the names
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch