ref #4247 - adapt systemName regex, remove contactPersonName regex