Replace 'Client Action Handlers' with 'Dispatch Interceptors'

Closes 582

Merged master and fixed conflicts.