case 2293 - Handle arbog reservations.
Merge branch 'case-2293' into develop