Custom select fields wrapped correctly
Merge branch 'develop'
Release version: 0.6.5