merge with fxm
merge with stash
update interactive marker when not tracking
threading gefrickel