Merge branch 'ctest_update-memory-problems' into release-3.11

Merge-request: !1893