Merge branch 'cleanup_20250916' into 'main'

mentioned in issue #1384 (closed)

mentioned in issue #1385 (closed)

mentioned in issue #1386 (closed)

mentioned in issue #1387 (closed)

mentioned in issue #1388 (closed)

mentioned in issue #1394

mentioned in issue #1395

mentioned in issue #1396

mentioned in issue #1397