Cherry pick for 6.9.1 patch release

[thomashampson]

Description of work

Contains the commits for work that was requested to go into the v6.9.1 patch release, but were previously merged into main, but with the release notes omitted.

Purpose of work

To move these two pieces of work ahead into the patch release:
#36935
#37016

The issues were already closed because the commits are already in main

To test:

Verify that the commits are those required.

This does not require release notes because they are in a separate PR

---

Reviewer

Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.

Code Review

• Is the code of an acceptable quality?
• Does the code conform to the coding standards?
• Are the unit tests small and test the class in isolation?
• If there is GUI work does it follow the GUI standards?
• If there are changes in the release notes then do they describe the changes appropriately?
• Do the release notes conform to the release notes guide?

Functional Tests

• Do changes function as described? Add comments below that describe the tests performed?
• Do the changes handle unexpected situations, e.g. bad input?
• Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

Gatekeeper

If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.

[robertapplin]

Elwin changes look right

[rbauststfc]

Looks good to me, thanks for this!