Introduce display_action
Merge branch 'display_action'