Merged changes from no-reservation