Merge branch 'field-handles' into 'master'

Remap invokedynamic field handles properly

Closes #317954

See merge request !327
1 job for master in 6 minutes and 23 seconds (queued for 12 seconds)