[SR-Dev] git:master: port from kamailio, r3528