[sr-dev] git:sr_3.0: Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0