Merge branch 'rtp-updates-sa4-134' into 'main'

Implement changes according to new spec

See merge request !2413