Thank you for working on this defect. I see that you have made some progress in build 7782, however there is still one defect remaining.
You fixed the function signature in tld when the return type uses generics (example below).
ut you did NOT fix function signature in tld when a method argument uses generics (example below)
Can you please create another JIRA task to fix this issue?