Commit 48776ea6 authored Feb 13, 2026 by norvell

Merge branch '20231020_maintenance-move-back-declarations' into '20231020_maintenance'

Revert moving of declarations from local blocks.

See merge request !2524