GS-26 some change done at morning
Merge branch 'GS-26FeatureBranch'