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