Merge branch '36-SBA-HRIR-Update' into 'main'

[non-BE] [rend-non-BE][ref-using-main] Resolve "[rendering] Contribution 036 : SBA HRIR Update Tasks"

See merge request !543