Merge "Update return values in main"