Merge "64 bit ABI struct returns - Issue 5570 again"