https://www.pivotaltracker.com/story/show/48495657
Merge branch 'dev_encoding_in_select_list_48495657' into develop