[sr-dev] New commits on branch treimann/master_tm-extend-callbacks