Merge Manually with Master re #6821

This was necessary, because of a delay in completing the testing of ticket #6752.

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>