v6.3.6 into v7.0.0 2026-07-06#44

StuartWheater merged 20 commits into

StuartWheater:v7.0-devStuartWheater/dsBase:v7.0-devfrom

datashield:v6.3.6-devdatashield/dsBase:v6.3.6-devCopy head branch name to clipboard