Merge "Prevent mac address truncation" into sc-dev