Development
master
Merging B2024-036 and F2024-063 from development into master after successful testing.
format only change. OK to move to testing phase.
Code changes look good. OK to generate test exe.
No dependencies set.
The note is not visible to the blocked user.
Merging B2024-036 and F2024-063 from development into master after successful testing.