dupl in controls
Merge branch 'develop'
dupl in ctrls