Merge branch 'hotfix-1-addWattsToDropDown' into develop