RAPID-1540_2 : Second Commit

RAPID-1540_2 : Second Commit With Common Change