Fixed NPE
Merge branch 'development' of git@github.com:lunifera/lunifera-ecview-addons.git into development