RAPID-1540_2 : First Commit (Common)
RAPID-1540_2 : Second Commit
Merge pull request #5 from VirajDaya/RAPID-1540_2

Merging RAPID-1540_2 : Second Commit
RAPID-1541_2 : First Commit after 949ca13772b7fb03ac35358b96515e244083590c