Merge remote-tracking branch 'origin/feature/HTJ-2.04.001-20250116' into feature/HTJ-2.04.001-20250116