Add support for mac1
/mac2
instances
#594
+63
−0
Merged
mac1
/mac2
instances
#594