Merge "fix broken OTAs; format() is called with wrong # of args"