Adding support for error handlers
Merge branch 'develop' into logoff_support

Conflicts:
	CHANGELOG.md