Merge "Swift formpost cleanup"