Fix for typos introduced in refactoring
Merge branch 'develop' into widget
Refactoring widget