Merged nikhil-rafica

merged Rafica’s changes