case 2187 - Pane autocomplete fields.
Merge branch 'case-2187' into develop