Removes need for _kwps_sort_order to be numeric value
Merge remote-tracking branch 'origin/develop' into develop