Merge branch 'ds/checkout-upper'