Issue 7686 - introduce action handlers