MDL-41953 allow multiple digits at the end of component names