Development
master
Merging C2017-031 and B2024-075 from development into master after successful testing.
Code changes look good. OK for testing phase.
Good for testing phase
No dependencies set.
The note is not visible to the blocked user.
Merging C2017-031 and B2024-075 from development into master after successful testing.