Hotfix: Move channel count to right position
Merge branch 'master' into navigator_rewrite_estimator