Merge branch 'ls/checkout-encoding'