Merge "EvsResult: resolve TODOs."