Merge branch feature/nspanel into master

...atusItemView