RAPID-1523_1 : Second Change 

 Merging RAPID-1523_1 : Second Change before  RAPID-1540_2, RAPID-1541_2 and RAPID-1542_2