Merge branch 'nd/checkout-option-parsing-fix'