[MERGE] Merged Dhruti's branch for the fix of avoiding crash when reservation is...