Merge "Cleanup for new result codes"