Merge development changes into master

Manage on the main modules: Pending and Wiki.