See TODOS for commit fixes

@eranaltay please deploy cloud job and function