Fixing problem with wrong rows selected after updating values in a column that is currently used for sorting.
Merge branch 'master' into parameter-image-model