case 2257 - Settings from reservation form are now handled by FE.
case 2257 - Fix after CR.
case 2257 - Fix error.
Merge branch 'case-2257' into develop