Changed number to pim_number
Merge branch 'maintenance/1.1_backports'