Backport of pd-l2ork array regression fixes.

See:
- https://github.com/pd-l2ork/pd-l2ork/commit/6dd2ca87
- https://github.com/pd-l2ork/pd-l2ork/commit/7b359c4b