[sr-dev] git:master:7ee642c5: tm: restore xavps & flags after rebuilding message