more debug info
Merge branch 'develop' into nofilter