case 2045 - Reserve-button logic refactoring.
Merge branch 'case-2045' into develop