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