Merge branch 'master' into treimann/master_tm-extend-callbacks