Merge "Ensure that split names are valid" into lmp-dev