RAPID-1542_2 : First Commit after 949ca13772b7fb03ac35358b96515e244083590c
Merge pull request #7 from VirajDaya/RAPID-1542_2

RAPID-1542_2 : First Commit after RAPID-1540_2 : First Commit (Common)