more text added
Merge branch 'candidate' into development