Multi vendor#3

jmacego wants to merge 2 commits intoxraystyle:masterxraystyle/mac_format:masterfrom

jmacego:MultiVendorjmacego/mac_format:MultiVendorCopy head branch name to clipboard