Merge "update all inprogress checks in apih handler"