merge mac/common-checkout