Merge pull request #318 from raghuvissu/obsplatform-2.02

selfcare changes