Issue 18848: Fixed issue with order not saving for options.