Rename mac into inspection number for Arm entity
Merge remote-tracking branch 'origin/master'