sync integrations/makeswift branch w/ canary
#2808
Merged
integrations/makeswift branch w/ canary
#2808