Merge pre-release/2024-r2.4 into master

[ndg63276]

NOTE: (PR title should be of the form ticket:short description, e.g. TICKET-123: Add more templates)

JIRA ticket: TICKET-123

Summary:

A brief description of what this pull request aims to achieve

Changes:

• List changes made in this pull request

To test:

• List actions that should be taken to test that functionality works as expected