[sr-dev] git:master: modules:tm Other function declaration fixes