E3-818: refactor handler
This is a duplicate of !143 (merged) in order to allow a series of changes to work on a develop branch.
All comments there are relevant for here, but we should move the merge to this branch instead.
This is a duplicate of !143 (merged) in order to allow a series of changes to work on a develop branch.
All comments there are relevant for here, but we should move the merge to this branch instead.