fix unis* problem with debugTools
Merge branch 'feature_24_linux_fix' into develop