case 4177 - Elimination of action buttons.
Merge branch 'case-4177' into development