Merge remote-tracking branch 'origin/release/HTJ-2.03.002-20240730' into release/HTJ-2.03.002-20240730 # Conflicts: # project.yaml