Merge remote-tracking branch 'origin/master' into feature/000397-investigate-and-fix-with

Spec-Ref: helix-specs@63fa8f82:000408_investigate-and-fix-with