Some enhancements
Merge branch 'development' of git@github.com:lunifera/lunifera-ecview.git into development