Merge "Cleanup handling of BinaryResult"