more text added
Merge branch 'candidate' into development
Merge branch 'development'