case 2899 - Field pane.
Merge branch 'case-2899' into develop