Merge branch '20231020_maintenance-move-back-declarations' into '20231020_maintenance'
Revert moving of declarations from local blocks. See merge request !2524
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Revert moving of declarations from local blocks. See merge request !2524