[sr-dev] git:master: Merge branch 'treimann/master_tm-extend-callbacks'