yes but I reckon it makes sense to merge this branch first and then update my locale-setting branch to do it