Merge branch 'ds/uintmax-config' (early part)