The original merge into main did not apply the changes. This fixes it. Closes gh-17635
Several method security tests rely on method parameters being preserved, in order to demonstrate the difference between relying on runtime reflection and using the @P annotation. Closes gh-15680
Closes gh-6819
Issue gh-3747
Fixes gh-3747