[SR-Dev] git:master: test: further portings to sr and small extensions