Manual merge branch 'enhancement#19' into development
Merge branch 'development'