Refresh table dropdown option
Merge branch 'dev'