Merge branch 'VikrumBranch' into tarandeepBranch