Merge branch '2.38 cherrypick' into 'master'

Package Merge Request

Package Changes

(Describe Package changes here)

Package MR

(Link to Package MR here)

For Issue

Closes (link to issue here)

Upgrade Notices

N/A

Closes #2377 (closed)