Merged Ritesh's PR