Merge branch 'master' into development
More handler tests
Merge branch 'development'