..
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
..
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
Merge pull request #292 from Ranjith15/obsplatform-2.02

small client review changes