merge branch carl_mac